Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Merge branch dev to main #309

Merged
merged 28 commits into from
Mar 6, 2024
Merged

chore: Merge branch dev to main #309

merged 28 commits into from
Mar 6, 2024

Conversation

github-actions[bot]
Copy link

This pull request will Merge branch dev to main.

@oSumAtrIX oSumAtrIX mentioned this pull request Feb 21, 2024
Closed
2 tasks
@oSumAtrIX oSumAtrIX marked this pull request as ready for review February 21, 2024 03:58
@cyberboh
Copy link
Contributor

CLI 4.4.1-dev.1 can not aligning apk

java -jar revanced-cli-4.4.1-dev.1-all.jar patch -p -o Install\Adobe_Lightroom_9.2.0-arm64-v8a-x86_64_ReVanced.apk --options options.json -b revanced-patches-4.3.0-dev.3.jar --alias=******** --keystore-password=******** --keystore-entry-password=******** --keystore=********.keystore -m revanced-integrations-1.4.0-dev.4.apk Apps\com.adobe.lrmobile-9.2.0-arm64-v8a-x86_64.apk
INFO: Loading patches
INFO: Decoding app manifest
INFO: Change package name excluded
INFO: Override certificate pinning excluded
INFO: Enable Android debugging excluded
INFO: Remove screen capture restriction excluded
INFO: Export all activities excluded
INFO: Predictive back gesture excluded
INFO: Spoof SIM country excluded
INFO: Remove screenshot restriction excluded
INFO: Spoof Wi-Fi connection excluded
INFO: Setting patch options
INFO: Executing patches
INFO: Disable mandatory login succeeded
INFO: Unlock premium succeeded
INFO: Compiling patched dex files
INFO: Compiled classes.dex
INFO: Compiled classes2.dex
INFO: Compiled classes3.dex
INFO: Compiled classes4.dex
INFO: Aligning APK
java.io.IOException: toDerInputStream rejects tag type 0
        at java.base/sun.security.util.DerValue.toDerInputStream(DerValue.java:1155)
        at java.base/sun.security.pkcs12.PKCS12KeyStore.engineLoad(PKCS12KeyStore.java:2013)
        at java.base/sun.security.util.KeyStoreDelegator.engineLoad(KeyStoreDelegator.java:221)
        at java.base/java.security.KeyStore.load(KeyStore.java:1473)
        at app.revanced.library.ApkSigner.readKeyStore(ApkSigner.kt:169)
        at app.revanced.library.ApkUtils.sign(ApkUtils.kt:104)
        at app.revanced.cli.command.PatchCommand.run(PatchCommand.kt:326)
        at picocli.CommandLine.executeUserObject(CommandLine.java:2026)
        at picocli.CommandLine.access$1500(CommandLine.java:148)
        at picocli.CommandLine$RunLast.executeUserObjectOfLastSubcommandWithSameParent(CommandLine.java:2461)
        at picocli.CommandLine$RunLast.handle(CommandLine.java:2453)
        at picocli.CommandLine$RunLast.handle(CommandLine.java:2415)
        at picocli.CommandLine$AbstractParseResultHandler.execute(CommandLine.java:2273)
        at picocli.CommandLine$RunLast.execute(CommandLine.java:2417)
        at picocli.CommandLine.execute(CommandLine.java:2170)
        at app.revanced.cli.command.MainCommandKt.main(MainCommand.kt:12)

@oSumAtrIX
ci: Split release into a separate PR build workflow
724593a 
Because the release workflow already runs on dev and main, it is not necessary to also trigger it for PRs.
ci: Do not start a Gradle daemon for PR builds
@cyberboh
Copy link
Contributor

cyberboh commented Mar 3, 2024

My issue above is caused by defined keystore entry [--alias=******** --keystore-password=******** --keystore-entry-password=******** --keystore=********.keystore]
I deleted all parameter, now it works. But this will make my old keystore not accepted. :(

@oSumAtrIX
Copy link
Member

Can you check the keystore type that CLI generates in main branch and here? https://stackoverflow.com/a/45882553

@cyberboh
Copy link
Contributor

cyberboh commented Mar 3, 2024

Can you check the keystore type that CLI generates in main branch and here? https://stackoverflow.com/a/45882553

Main branch is BKS while dev branch is PKCS #12

@oSumAtrIX oSumAtrIX mentioned this pull request Mar 4, 2024
Merged
@oSumAtrIX
Copy link
Member

PKCS #12 seems to be the default keystore type specified by the keystore.type security property. Previously BK was hardcoded but now the default type is used:

https://github.com/ReVanced/revanced-library/blob/3aa6dc223a9a1a2f735eda407917548ecbd366aa/src/main/kotlin/app/revanced/library/ApkSigner.kt#L120

The code can attempt to use BK provider as that was previously hardcoded as a migration

oSumAtrIX and others added 3 commits March 4, 2024 15:36
@oSumAtrIX
Copy link
Member

@cyberboh Reverted to BCS, check again

@cyberboh
Copy link
Contributor

cyberboh commented Mar 4, 2024

@cyberboh Reverted to BCS, check again

Thank you, working fine :)

java -jar revanced-cli-4.4.1-dev.2-all.jar patch -p -o Install\X_(formerly_twitter)_10.30.0-release.0-all_ReVanced.apk --options options.json -b revanced-patches-4.4.0-dev.1.jar --alias=******** --keystore-password=******** --keystore-entry-password=******** --keystore=********.keystore -m revanced-integrations-1.4.1-dev.4.apk Apps\com.twitter.android-10.30.0-release.0-all.apk -i "Hide view count" -i "Open links with app chooser"
INFO: Loading patches
INFO: Decoding app manifest
INFO: Change package name excluded
INFO: Override certificate pinning excluded
INFO: Enable Android debugging excluded
INFO: Remove screen capture restriction excluded
INFO: Export all activities excluded
INFO: Predictive back gesture excluded
INFO: Spoof SIM country excluded
INFO: Remove screenshot restriction excluded
INFO: Spoof Wi-Fi connection excluded
INFO: Setting patch options
INFO: Merging integrations
INFO: Deleting existing temporary files directory
INFO: Decoding resources
INFO: Executing patches
INFO: Dynamic color succeeded
INFO: Hide ads succeeded
INFO: Hide recommended users succeeded
INFO: Hide view count succeeded
INFO: Open links with app chooser succeeded
INFO: Unlock downloads succeeded
INFO: Compiling patched dex files
INFO: Compiled classes.dex
INFO: Compiled classes2.dex
INFO: Compiled classes3.dex
INFO: Compiled classes4.dex
INFO: Compiled classes5.dex
INFO: Compiled classes6.dex
INFO: Compiled classes7.dex
INFO: Compiled classes8.dex
INFO: Compiled classes9.dex
INFO: Compiled classes10.dex
INFO: Compiled classes11.dex
INFO: Compiled classes12.dex
INFO: Compiling modified resources
INFO: Aligning X_(formerly_twitter)_10.30.0-release.0-all_ReVanced.apk
INFO: Signing X_(formerly_twitter)_10.30.0-release.0-all_ReVanced.apk
INFO: Saved to E:\ANDROID\APPS\ReVanced\Patched\Install\X_(formerly_twitter)_10.30.0-release.0-all_ReVanced.apk
INFO: Purging temporary files
INFO: Failed to purge resource cache directory

But, Failed to purge resource cache directory thingy is still annoying me.

@oSumAtrIX
Copy link
Member

I have no clue why it fails to delete the folders. Possibly something is still running in it and it cant delete it, not sure

@oSumAtrIX oSumAtrIX merged commit 164d09d into main Mar 6, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cyberboh @oSumAtrIX @semantic-release-bot